Migrate run make issue 15460 #125886

GuillaumeGomez · 2024-06-02T09:56:14Z

Part of #121876.

r? @jieyouxu

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18

rustbot · 2024-06-02T09:56:23Z

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

Some changes occurred in src/tools/compiletest

cc @jieyouxu

src/tools/run-make-support/src/lib.rs

src/tools/run-make-support/src/rustc.rs

src/tools/run-make-support/src/lib.rs

GuillaumeGomez · 2024-06-02T11:04:18Z

build_native_static_lib now returns the path.

jieyouxu

Thanks, just one omission and then r=me after CI is green.

src/tools/run-make-support/src/lib.rs

GuillaumeGomez · 2024-06-02T11:15:29Z

Added missing track_caller.

tests/run-make/issue-15460/rmake.rs

GuillaumeGomez · 2024-06-02T14:39:02Z

@bors r=jieyouxu rollup

bors · 2024-06-02T14:39:05Z

📌 Commit 36aba94 has been approved by jieyouxu

It is now in the queue for this repository.

…sue-15460, r=jieyouxu Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu`

Rollup of 5 pull requests Successful merges: - rust-lang#121062 (Change f32::midpoint to upcast to f64) - rust-lang#125808 (Migrate `run-make/c-link-to-rust-dylib` to `rmake.rs`) - rust-lang#125886 (Migrate run make issue 15460) - rust-lang#125890 (Improve compiletest expected/not found formatting) - rust-lang#125896 (compiletest: fix outdated rmake.rs comment) r? `@ghost` `@rustbot` modify labels: rollup

workingjubilee · 2024-06-02T19:55:44Z

Died in #125899 (comment)

@bors rollup=iffy r-

jieyouxu · 2024-06-03T01:29:47Z

Not for this PR, but we should add a env var helper that actually reports which env var isn't present...

GuillaumeGomez · 2024-06-03T07:30:37Z

It's not for this PR indeed. Re-approving it.

@bors r=jieyouxu rollup

bors · 2024-06-03T07:30:39Z

📌 Commit 36aba94 has been approved by jieyouxu

It is now in the queue for this repository.

GuillaumeGomez · 2024-07-22T15:54:59Z

@bors try

bors · 2024-07-22T15:56:10Z

⌛ Trying commit 7ad48c7 with merge 3df2450...

…e-15460, r=<try> Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu` try-job: x86_64-msvc

jieyouxu · 2024-07-22T16:40:17Z

Actually, 33c4a6f looks like a messed up rebase?

bors · 2024-07-22T17:32:07Z

☀️ Try build successful - checks-actions
Build commit: 3df2450 (3df2450e3a539240748cb2d96ce9011e14f3a9f2)

jieyouxu · 2024-07-22T17:44:43Z

@bors try (please be sane)

…e-15460, r=<try> Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu` try-job: x86_64-msvc try-job: aarch64-apple try-job: x86_64-gnu-llvm-18

bors · 2024-07-22T17:46:32Z

⌛ Trying commit 7ad48c7 with merge 90029d3...

bors · 2024-07-22T19:58:11Z

☀️ Try build successful - checks-actions
Build commit: 90029d3 (90029d39c1b0f480a15b91b1da8b0ed86519cf69)

… of the `msvc_lib` binary

GuillaumeGomez · 2024-07-22T21:24:04Z

Fixed the merge conflict, try is happy. I think it's finally ready for merge. :D

jieyouxu

Just a comment nit, r=me after that

src/tools/run-make-support/src/lib.rs

…static-lib-to-dylib`

GuillaumeGomez · 2024-07-23T10:07:29Z

Finally! \o/

@bors r=jieyouxu

bors · 2024-07-23T10:07:31Z

📌 Commit 3de5252 has been approved by jieyouxu

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#125886 (Migrate run make issue 15460) - rust-lang#126898 (Migrate `run-make/link-framework` to `rmake.rs`) - rust-lang#126994 (Support lists and stylings in more places for `rustc --explain`) - rust-lang#127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake) - rust-lang#128060 (Fix inclusion of `wasm-component-ld` in dist artifacts) - rust-lang#128082 (Note closure captures when reporting cast to fn ptr failed) - rust-lang#128098 (make it possible to disable download-rustc if it's incompatible) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issue-15460, r=jieyouxu Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu` try-job: x86_64-msvc try-job: aarch64-apple try-job: x86_64-gnu-llvm-18

rustbot assigned jieyouxu Jun 2, 2024

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 2, 2024

jieyouxu reviewed Jun 2, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved

src/tools/run-make-support/src/rustc.rs Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 32edd4e to 60f237b Compare June 2, 2024 10:15

jieyouxu reviewed Jun 2, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 60f237b to 30cd434 Compare June 2, 2024 11:04

jieyouxu reviewed Jun 2, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 30cd434 to 050ff9c Compare June 2, 2024 11:14

jieyouxu reviewed Jun 2, 2024

View reviewed changes

tests/run-make/issue-15460/rmake.rs Show resolved Hide resolved

jieyouxu approved these changes Jun 2, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 2, 2024

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 2, 2024

Rollup merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-is…

8d471c8

…sue-15460, r=jieyouxu Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu`

jieyouxu mentioned this pull request Jun 2, 2024

Rollup of 5 pull requests #125899

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 3, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024

Auto merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issu…

3df2450

…e-15460, r=<try> Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu` try-job: x86_64-msvc

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

This comment was marked as outdated.

Sign in to view

Add new MSVC_LIB_PATH runtest environment variable to know location…

7e0c203

… of the `msvc_lib` binary

GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 7ad48c7 to 1671460 Compare July 22, 2024 21:23

jieyouxu approved these changes Jul 22, 2024

View reviewed changes

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved

GuillaumeGomez added 3 commits July 23, 2024 11:47

Add run_make_support::build_native_static_lib function

84eee68

Migrate run-make/issue-15460 to rmake.rs

5257ca7

Rename tests/run-make/issue-15460 into `tests/run-make/link-native-…

3de5252

…static-lib-to-dylib`

GuillaumeGomez force-pushed the migrate-run-make-issue-15460 branch from 1671460 to 3de5252 Compare July 23, 2024 09:47

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 23, 2024

matthiaskrgr mentioned this pull request Jul 23, 2024

Rollup of 7 pull requests #128109

Merged

bors merged commit 9d4daf8 into rust-lang:master Jul 23, 2024

rustbot added this to the 1.82.0 milestone Jul 23, 2024

GuillaumeGomez deleted the migrate-run-make-issue-15460 branch July 23, 2024 22:07

Migrate run make issue 15460 #125886

Migrate run make issue 15460 #125886

Uh oh!

Conversation

GuillaumeGomez commented Jun 2, 2024 • edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 2, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 2, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 2, 2024

Uh oh!

Uh oh!

GuillaumeGomez commented Jun 2, 2024

Uh oh!

bors commented Jun 2, 2024

Uh oh!

workingjubilee commented Jun 2, 2024

Uh oh!

jieyouxu commented Jun 3, 2024

Uh oh!

GuillaumeGomez commented Jun 3, 2024

Uh oh!

bors commented Jun 3, 2024

Uh oh!

GuillaumeGomez commented Jul 22, 2024

Uh oh!

bors commented Jul 22, 2024

Uh oh!

This comment has been minimized.

This comment was marked as resolved.

jieyouxu commented Jul 22, 2024

Uh oh!

bors commented Jul 22, 2024

Uh oh!

This comment was marked as outdated.

jieyouxu commented Jul 22, 2024

Uh oh!

bors commented Jul 22, 2024

Uh oh!

bors commented Jul 22, 2024

Uh oh!

GuillaumeGomez commented Jul 22, 2024

Uh oh!

jieyouxu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

GuillaumeGomez commented Jul 23, 2024

Uh oh!

bors commented Jul 23, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

GuillaumeGomez commented Jun 2, 2024 •

edited by jieyouxu

Loading